V0.0.6 : Small changes and bugfixes