Merge pull request #1 from albreyb/master

New Style