Code cleanup and input documentation. Closed #8
Documentation Fix
Merge branch '0.2.0'