bug-fix
Merge pull request #15 from NS-Projects/Eduard

bug-fix