Forgot to commit these in the final commit
Merge pull request #31 from isupeene/final

Forgot to commit these in the final commit Merge 31