Merge pull request #3 from sailthru/feature/ns_ts_removal

Feature/ns ts removal
fix