Merge pull request #349 from thriuin/master

Clean up some sloppy changes and typos
Add new organization