Merge branch 'master' of https://github.com/f4hy/effectivemass