Tkuldeep/85 92 branch fix

This pull request has completer work of issue #85, #89, #90, #94