fix #404 (me and german we found a solution, but the usage will tell if its stable enough)
Merge branch 'master' of https://github.com/appsgate2015/appsgate