Command line improvements

If anyone knows how to squash all of the commis into one then please do it. I got in a mess with git here.
Fixes issue #27