Updated README
Merge branch 'dev'
whitespace fix
added profile build to makefile
Merge branch 'master' into dev