new fix
Merge pull request #1 from yuco91/dev-2.0

new fix merging