Merge pull request #17 from bjacobel/connor

Connor
Merge pull request #18 from bjacobel/connor

Re-wrote some of the code just to be sure…no noticeable changes though