v0.1 - Some little changes