Develop

Fixes #25, #24, #20, #2