Blocked by #57
Closes #62
rebased onto eb1c27f2067db21cb7f37cff991cd7dd48b86e95
Good work @amitosh. Merging.
Pull-Request has been merged by a2batic
Blocked by #57
Closes #62