Bumped up version
Replaced my code with Luke's version