fixed issue #63
Merge remote-tracking branch 'manoj-remote/issue63' into issue63