tweaks
Merge pull request #484 from JahPowerBit/develop

tweaks