v0.1.5, fixes.
Merge branch 'release/0.1.5'