version 2.0.1

Code refactored