fix issue #25

clean fix with 3-way argument parse and elif statements for switching