Commit 5
Merge pull request #2 from dragonholiday/master

Commit 5