Changed encoding to UTF-8, minor code changes
Minor code changes. Encoded to UTF-8