fixed with better impl
Merge remote-tracking branch 'origin/dev'

Conflicts:
	bin/rask