v0.3 - Added and fixed stuff