Added new feature
Fixed bug