Fix
Merge branch 'master' of github.com:shyndman/genarthack2012