Merge pull request #127 from derhansen/master

Update README.md
Merge pull request #128 from derhansen/development

Development
Merge remote-tracking branch 'upstream/master'