bug fixes
Merge branch 'master' of https://github.com/x3mSpeedy/Project-Cyclone