Merge pull request #15 from qbuat/master

NP scans
updates
small changes