bug fixes
Merge pull request #1 from NiceBro/master

bug fixes