Version Bump
Merge pull request #9 from unikent/master

Merge master into STABLE