Merge pull request #3 from jawwad/master

Fix a few instances of spaces in class names starting with the NS prefix