Merge branch 'newpumpprofile' of https://github.com/amunter/Libraries.git into dev
Reverted back NON to None for backward compatibility
close #175
Merge branch 'dev' into current