Major update fixes #3 fixes #5