bug fixing b4 release
Merge pull request #15 from vanimurarka/bug-fixing-b4-release

bug fixing b4 release