Rewriting to do away with needing to know about version
Merge pull request #1 from craigloftus/master

Rewriting to remove hardcoded values