fixed issue #27 changed js function to get the error on screen
Removed conflicts after merge