Initial project version
merge
fix for Mac