Avoid crash issues
Merge branch 'master' of github.com:kazyx/WPPMM