General changes and improvements
Merge pull request #3 from AlejandroPerezMartin/develop

General changes and improvements