Version 0.1.0 with a few bug-fixes