Merge pull request #24 from fmondak/master

Merge pull request #5 from spinfojava/master
Merge pull request #6 from spinfojava/master

Merge pull request #24 from fmondak/master