Merge pull request #2 from bizdevfe/master

merge remotes
Merge pull request #5 from heatroom/master

Merge pull request #2 from bizdevfe/master