refixing
Merge pull request #69 from BooneTeam/fixes

refixing