Merge pull request #2 from spinfojava/master

Merge pull request #19 from fmondak/master
Merge pull request #20 from fmondak/master

Merge pull request #2 from spinfojava/master