Close GH-22: Conditional shortcut. Fixes #21
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

Conflicts:
	dist/app.js
update dist