Merge pull request #1 from tattedweazel/dev

Updating order of comments