Fix some things
Merge pull request #4 from nsTsoTest2/patch-2

Fix some things