latest updates
Merge pull request #1 from gouwestadmm/master

latest updates