Check this out
Merge pull request #12 from ghibane/master

Elena's recommendation