Added test
Merged with master