updated README
a little clean up on include directives
Merge remote-tracking branch 'origin/develop'