Fixes in accordance to: https://github.com/CyCoreSystems/agi/pull/1#issuecomment-292533695
Fixes in accordance to: https://github.com/CyCoreSystems/agi/pull/1#issuecomment-292533695

CyCoreSystems/agi,CyCoreSystems/agi