fix CLI arguments to work regardless of order #70

Simple fix for the cases specified.