review and corrections
Merge pull request #70 from TurtleFromMars/develop

review and corrections