Merge pull request #6 from MMKrell/patch_spring_2014

spring patch