Initial implementation of #236.
Added documentation and comments to initial implementation of #236
Added unit test for implementation of #236
Add documentation for #236
updated test class heading #236
Merge branch 'refs/heads/#236'