Merge pull request #9 from gregdavill/nx_support