Added support for defining a custom keystore
Corrected white space
Merge pull request #132 from moutsosgeorgios/master

Support for specifying a custom keystore