Merge pull request #21 from mikaeljorhult/master

Version 0.1.5.2, 0.1.5.3 and 0.1.6. Fix #3, #4, #17, #18, #20 and #22.