* Code cleanup
* Incremented version