Issue #18

Tested, removed backup of old stunfunctions