Merging Pull Request #14

I messed up handling this on the command line, so I'm doing it manually because no one is paying attention.