Fixed a small bug, and made version ready to merge with master