fix with tony's feedback
Merge pull request #4 from bechi/temp

fix with tony's feedback