Reflected review comments #9

Please review and merge with master if all OK #9 
The branch has already been checked by executing selenium test cases on Jenkins.