Fixed some stuff in a panic (I hope it was fixing that I did...)
Merge pull request #17 from Winston-Chan/testing

Fixed some stuff in a panic (I hope it was fixing that I did...)