Merge pull request #5 from ctrovato/egemayel

Merge pull request #4 from ctrovato/master
Merge branch 'master' into egemayel