Closes #44. Closes #45. Closes #46. Ready for 0.0.6