Add custom charge API call added
NPE and API inconsistency fixed
Merge pull request #2 from UWS-Software-Service/master

Custom charge API + bug fixes