Merge pull request #11 from esiragusa/develop

Merge branch master into develop