updates from pooltest
merge with master