Merge pull request #24 from obsy/master