Incorporate changes made relative to (https://github.com/hackergram/xetrapal/issues/10)
Incorporate changes made relative to (https://github.com/hackergram/xetrapal/issues/10)