Merge pull request #1 from mkepug/master

Test
Merge pull request #9 from jeremydee/master

Merge pull request #2 from mkepug/master