Merge pull request #3 from spinfojava/master

Merge pull request #20 from fmondak/master