Bugfix commit, fixes: #73, #74, #75, #77 and #79.
resolved merge conflict