Merge pull request #37 from Intichar/master