Merge pull request #33 from c410echo/dev

Echo 0.0.4
Merge pull request #5 from c410echo/master

Merge from master
Hannah's contributions
Merge pull request #51 from mbeall/master

Hannah's contributions