Fixes #3, #5 and #6
0.3.1