Merge pull request #2 from alilja/master

Added command line arguments.
Merge branch 'master' into intervals
Merge pull request #3 from alilja/intervals

Intervals