bugfixes
Merge branch 'master' of github.com:mwaylabs/TMP2
removed window from namespace setup to make server-side usage possible