Version Bump
Merge pull request #15 from unikent/master

Merge master into STABLE