added the new usse50 stuff
Merge branch 'issue50'
Merge branch 'testing'