Refactoring phase one
Refactoring phase 2, bump version to 2.0
Muting some logging
Fixing template issue
Merge branch 'master' into github