CleanUp
Fix url
Merge pull request #765 from erwinwinder/master

CleanUp and url fix
Merge pull request #764 from dennishendriksen/master

Remove build warnings
add missing div
throw error for non implemented method
improved error handling
Improved error handling