Merge pull request #21 from Z3po/master

cleanup and POC psl-cmd implementation
Bugfix for ISSUE #22