Final fixes for 0.0.1 version