Version Bump
Merge pull request #10 from unikent/master

Merge master into STABLE