Merge pull request #4 from spinfojava/master

Merge pull request #21 from fmondak/master
Merge pull request #22 from fmondak/master

Merge pull request #4 from spinfojava/master