Merge pull request #92 from sebix/master