Merge pull request #17 from costaivo/master

Merged Changes from master