Rebase Z-Push 2.0.7
Merge pull request #68 from fmbiete/master

Rebase Z-Push 2.0.7