Merge pull request #11 from c410echo/master

Merge from master
Last minute changes
Changes from this morning
Merge pull request #78 from c410echo/pr/77

Pr/77