Changes being done on develop branch
Merge pull request #1 from fabes/develop

Changes being done on develop branch