Merge pull request #1 from mfittere/master

bug fixes
change help message
updating license
Merge pull request #1 from SixTrack/master

merge pull request #1 from rdemaria