Merge pull request #31 from xerus/master