Fixed Bug #143, added labes to input fields
Merge branch 'bugfix/143' into develop