Feature/abmohan #3

Closes#3