Change of heart on single line if statements
Update for release 2.0.0
Merge pull request #57 from refactorthis/dev

Merge dev to master for release 2.0.0