udpated to last revision because of some (minor) bugfixes