Merge pull request #33 from costaivo/master

Merged Code from Master