3.6 Version

Closes #10, Fixes #13, Closes #15, Fixes #16