merged mookie5dc-master pull request into master