Added new feature
bug fix
Merged the two together