Merge feblehober123/master, fixes #5