Commit d2e7532f620acd467ebeef0b3c4318420f445a13

Ben Straub 2013-10-10T13:56:28

Be more flexible with argument order and format