v0.1 - Some fixes and tweaks (;