bug fix final
Merge pull request #26 from codefalcon/feature

bug fix final