Merge pull request #22 from Magenic/master

Moving code into my mainline.
Fixing activity submit to the way it was before the workaround.
FIxing issue #58 and #59
Merge pull request #23 from Magenic/master

Merging in changes with my mainline.
Fixing issue #77
Merge pull request #80 from jwendl/master

Fixing various bugs.