fixed issue #17
fixed issue #27
Merge branch 'master' of https://github.com/niralittle/Notus