Merge pull request #3 from ningosi/master

https://issues.openmrs.org/browse/OCLM-2
OCLM-2 Fixed saving subscription
Removed code duplication