fixes and improvements
fix syntax
fix syntax
more fixes
more fixes
more fixes
more fixes
Merge remote-tracking branch 'vaneyckt/improvements-and-fixes' into improvements-and-fixes

Conflicts:
	lib/helpers.rb