Merge pull request #45 from mpeuster/master

Cleanup and README.md update based on inputs of WP5 call today.