Fixes #15, Fixes #14, started to work on #16