Added push functionality (again)
Merge branch 'master' into gh-pages