#48 Fixed minor bug in form validator
#149 Merge branch 'origin/develop'