ok so it's not perfect
Merge pull request #31 from andrewjadams3/merge

ok so it's not perfect