#636 added test
Merge remote branch 'fork/636'