adds fit switch and better argument handling
Merge pull request #3 from drewcummins/master

adds fit switch and better argument handling