pulling new master
Merge branch 'master' of https://github.com/ztnark/chicageaux into geoff
Merge pull request #53 from ztnark/geoff

Geoff