Fixes #105, Fixes #106, Fixes #107