dfex/NCE — pull request #1 by dfex (2014-05-09 00:40:16+00:00)
Title: Synchronising master with my branch

Hopefully this is me syncing changes from the Jeremy's master down to my fork. If not, I apologise!