Added another feature and fixed a small bug