Merge pull request #30 from toniz4/master