Added feature 1
Fixed bug
d