merging changes
Merge branch 'master' of github.com:jtramm/SimpleMOC