Zeminix Patch

Incorporating edits by Zeminix into master