Fixes to address bug 119
In process for fixing #138
In process for fixing #138
In process for fixing #138