update modules
Merge pull request #19 from chris-held/updates

update modules
conflicts