Merge pull request #206 from Maledictus/master

NSM