Merge pull request #117 from obsy/master