Merge pull request #33 from pannellr/master

Updating Aboodie's branch