Merge Request

Includes
1)Enhancement #107