bug fix
Merge pull request #34 from ataro24/merge_test

bug fix