Merge pull request #11 from danielmarbach/develop

Updates to NMS 1.6