Merge pull request #325 from trlsmax/master