Fixing to work with ARGV
Fixture
Merge branch 'master' of https://www.github.com/thebravoman/software_engineering_2014