Fixed various issues with this version.
Please refer to README.md for a complete list of changes.