added to handler and test
added changes, merged with master