pushed epoch up to 2
bumped version
Merge branch 'master' into production
bumped version