Merge pull request #3 from mrbarde/master

"Changes"
Merge pull request #4 from mrfoh/master

Merge pull request #3 from mrbarde/master