fixes #426
Merge branch 'master' of github.com:sharewave/frontus