merg test to branch #10

Closed fnk0 closed 9 years ago