fixing yet another stuid merge mistake
fixing mistaken merge
adding some run instructions to README.md
Merge branch 'dev'
Merge branch 'master' into macosx