Removed all the main() methods from core.py
Merge remote-tracking branch 'origin/master'