Removed trait constructor (breaks proxies). Static builder is still available
Merge branch 'master' of github.com:greenkin/magic