NSM: fixes for pr #182
Merge branch 'nsm' of github.com:Maledictus/leechcraft into nsm