Merge pull request #5 from heatroom/master

Merge pull request #2 from bizdevfe/master
Revert "Merge pull request #2 from bizdevfe/master"
Merge pull request #6 from bizdevfe/revert-5-master

Revert "Merge pull request #2 from bizdevfe/master"
Merge pull request #3 from bizdevfe/master

update...