Version Bump
Version Bump
Merge pull request #7 from unikent/master

Merge master into STABLE