Updated version number.

Ported latest changes to Linux version.

Performed small cleanup changes.