Squashing again for PR
Merge pull request #2 from aghosn/master

First PR