fixed #1467
small tweaks
added files for #1435