Still not working in live
Bumped version
Merge branch 'release-0.1.8'

Conflicts:
	bower.json