Merge pull request #1 from ryanstreet/develop

fixing comments