Should be working version
Merge pull request #21 from brain-murphy/connorbranch

Should be working version