'NoneType' fix
Merge pull request #8 from 3M3RY/master

'NoneType' fix