update to src/main.cpp merge
Merge branch 'master' of github.com:kevr/module