Feature/pr 114

Merge for requested feature