Merge pull request #3 from bcoe/master

Sync with remote master
Fix #14
Merge pull request #15 from DeviaVir/fix-readme

Fix readme