fixed #1467
small tweaks
added files for #1435
Merge pull request #1468 from EPuncker/master

fixed #1467