Closes #94
rebased onto 9de1ed0d165444064fd8b0132feb23b47b4b716c
rebased onto b1b96bfbb7771558f49589eda84ddf9ba9880539
Pull-Request has been merged by amitosh
Closes #94