Merge pull request #34 from twiniars/master

fix
fix