Moved proposal to doc directory.
Added test with template class.
Resolve conflics.