command line options, cmap arguments
Merge pull request #12 from henrikef/master

command line options, cmap arguments