DevOnly
0.9.0: Bug fixes, Minor improvements & test addition