Nnlm

merging everything to master