* updated to latest bugfixes from master