Bum
Merge 9105826f17df5c6aa5045d2648a7caf3c571b18d into 818258b99ec13c5235ff9e0642ff0c81f172a215
Bumping version
Merge pull request #5 from DavidTanner/merge-test

Merged