submitted version to #hack4good
Merge branch 'master' of github.com:RIAEvangelist/Octopi