Update 0.3, Closes #19, Closes #3, Closes #24