Merge pull request #10 from JavaCount/master

Change a lot