fix changes in order to sync develop with master
Merge pull request #87 from jesuspg/fix_develop

fix changes in order to sync develop with master