Cleaning and Modification to prepare move to 0.0.5 release