added by leisore
merge with tests commit