Add some more complex features that are needed for Nitro
Merge branch 'master' into nitro
Merge pull request #1 from stayradiated/nitro

Nitro