0.1.1 - closes #4, #5, #6