Pharmaship 1.1

This pull request should allow to add little new features, enhancement and bug fixes from Pharmaship 1.0.