Cleaned up main.cpp
Merge branch 'master' into experimental