fixes #1 (closed). @khanna38 please visually verify and merge.
requested review from @khanna38
mentioned in commit 20fe9189
merged