Pull fork 1

bugfixes and search