pmp commit
Merge https://github.com/chrisenabled/pumpmanagerpro