Updated names/use of internal variables; Spelling corrections; Added TODO; Updated version to 1.0.1
Merge branch 'develop'