Merge branch 'hotfix/fix.21'
fix #22
fixes #24,  #19
Merge branch 'hotfix/realPath.conversion' into develop

Conflicts:
	src/client.coffee