Issue #1: Fix issues with merge from master
Revert "Issue #1: Fix issues with merge from master"

This reverts commit 58c7b46a26ab4939671451f725bfdf1c551c5007.
Issue #1: fixing merge issues
Merge pull request #4 from bloomj/Issue#1_UpdateReadme

Issue#1 update readme