fix the compilation issues
Merge pull request #5 from padsley/dev

Update README.md
Merge pull request #6 from padsley/master

'dev' fix from 'master'