first working implementaion, some cli fixes still needed
Merge pull request #14 from cbyn/chris

first working implementaion, some cli fixes still needed