Cleaned up code.
Proper version number increase.