Merge pull request #670 from hegek87/havoc

Status modal now functions properly
Merge remote-tracking branch 'upstream/havoc' into havoc