Fixes 5-8-2014
Merge pull request #386 from calblueprint/fixes-5-8

Fixes 5-8-2014