Merge pull request #3 from c410echo/master

Merge from master
Merge pull request #4 from c410echo/master

Merge from master
Merge pull request #18 from mbeall/master

Merge from master