update core & contrib
Merge pull request #96 from betz/master

update core and contrib