added regression test
added docs
added docs
Merge branch 'docs'