Fixed code, updated AssemblyInfo