Added bugfixes from other branch without merging and adjusted README a bit. Merging with Master and publishing as Beta1.7