Bug Fixes

I fixed issue 12. I'm going to try and fix 27 soon as well so you can pull that one in.