Merge pull request #138 from xd009642/master

Adds def site feature to super-unstable