Merge pull request #4 from Strongreen/master

Merge pull request #2 from Host32/master