Update from 6/24/2014

Tuesdays update
Merge pull request #2 from yanspeers/Ian

Update from 6/24/2014