Merge pull request #19 from KurtStam/master

SRAMP-149 use cli all the way