Refractoring
Merge branch 'master' of https://github.com/syhc/Giberson-et-al.
Commit Again

Assembly does not like me
Merge pull request #30 from syhc/master

Fixes Tram namespace issues