cleanup of some code and globals
unix bug; commandline returns extra param, add extra () to strip it to 1 return value
Merge pull request #157 from Tieske/some_cleanup

cleanup of some code and globals
version 1.9.0
add ev token tests
Merge pull request #159 from lipp/more-token-tests

add ev token tests
failed merge