exception fix
Merge branch 'master' of ssh://github.com/statek/spop2014l