Fixed a number of bugs
Updated version numbers