merging
Merge branch 'master' of github.com:govoni/FlatNtStudy
updates