Crap!
Merge fix-0.1.3 for release