Added new feature from Nitrous
Merge origin with Nitrous.