some fix
Merge branch 'source' of github.com:johnkstockton/johnkstockton.github.com into source