Refactoring

Changed a nested if statement to be an easier to read guard statement instead.
Merge branch 'patch-1' of github.com:Cipherwraith/hawk into Cipherwraith-patch-1
fix compilation error
Merge branch 'Cipherwraith-patch-1' into develop