Merge branch 'hotfix/fix_possible_reference_issue'
Merge branch 'release/0.01'
Probably a really, really, bad thing. This needs to be refactored
Merge branch 'hotfix/temporary_badness' into develop