version++;
Merge branch 'master' of github.com:tronje/gss