Merge pull request #81 from BuracayBeach/v2.1.b

bug fixes lang dre
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into v2.2
Merge pull request #85 from BuracayBeach/v2.2

V2.2