0.3.1.3

Bug fix and Clean Up