Updated to latest version with bug fixes