Fixedup version pushed to github, not tested, use with caution