Merge pull request #7 from MartinEmilio/master

commit_17-02-14-3