bugfixes and small adjusts
Merge branch 'master' of github.com:Weblinia/hage-api