Merge pull request #21 from 1ec5/master