Resolving issue 140
Resolving issue 140