Made a string a bit less magic
Ning + Refactoring
Merge pull request #4 from graymalkin/changes

Changes