Merge pull request #33 from pannellr/master

Updating Aboodie's branch
Merge pull request #42 from pannellr/gattous

Merge pull request #33 from pannellr/master