Version 0.6: Fixed a couple of bugs