Change 

Change and review
Merge pull request #16 from onimini/patch-15

Change