incf-nidash/nidm — pull request #138 by jbpoline (2014-08-04 07:22:05+00:00)
Title: trying to merge Nolan #111 and Camille's #121

But please check it ... I might have messed it up - I got lost at some stage...