This commit should fix: #8, #24, #25, #29, #30, #31, #32
(Note: some fixes are caused by changes in the dependencies and are thus not part of the code base)