Fixes 30
Merge branch 'master' into impl-409

Conflicts:
	app.js