Version 1.6: Fixed minor issues.