Fixed issues #9 and #13. Can now pull testing into master!
Merge pull request #14 from bensaward/testing

Fixed issues #9 and #13. Can now pull testing into master!