bugs fix
Merge branch 'master' of https://github.com/WhyNotZoidberg/SW6Parrot