Merge pull request #5 from spinfojava/master

up