reverted some stupid things ;-), fixed master branch.