Fixes for CVE-2014-0130
Merge branch 'develop' of github.com:scholarslab/prism into develop