Fixed single quotes issues, added tests, removed unused using and code cleanup
Merge pull request #10 from am11/master

Fixed single quotes issues, added tests, removed unused using and code cleanup