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

Merge master into STABLE