Refactoring
Version set to 0.1