Merge pull request #1 from EoinDavey/master

Update
Merge pull request #2 from EoinDavey/master

pull everything
Merge pull request #3 from EoinDavey/master

Update once again
Merge pull request #2 from PowerblockSoftware/master

Updating merges