Bugfixed
Merge branch 'master' of https://github.com/stampzilla/stampzilla-go