Merge branch 'master' of https://github.com/jmaraisrsa/NPwD.git