Initial project version
merge
fix for Mac
cleanup
Merge branch 'releaseCandidate'