progress from 6/23/2014
Merge pull request #1 from yanspeers/Ian

progress from 6/23/2014