fix #103
fixed #103
Merge branch 'feature103' into develop

Conflicts:
	application