Merge pull request #32 from samuelyuri/develop

Develop to Master
#26 Add properties file containing configuration data.
From @Component to @Repository