bug fix
Merge pull request #36 from ataro24/merge_test

bug fix