changing to parameterized
Merge branch 'master' of github.com:uphillian/advpup