closes #64
Merge branch 'master' of github.com:swanson/swanson.github.com