Merge pull request #14 from micovery/master

Updating my workbranch
Issue #18

NOT FULLY TESTED! BE CAREFUL! DO NOT MERGE INTO MASTER (YET)!
Issue #18

Tested, removed backup of old stunfunctions
Merge pull request #30 from micovery/chill0r-work

Issue #18