Issue #17 - Fixes by Oxy1 - Thanks!
Issue #17 - Fixes by Oxy1 - Thanks!

Zentyal/Z-Push-contrib,fmbiete/Z-Push-contrib,mta59066/Z-Push-contrib,RavenB/Z-Push-contrib,Takika/Z-Push-contrib,Freeaqingme/Z-Push-contrib