Changed branch to havana
Merge branch 'master' into stable/havana
Merge pull request #7 from retr0h/stable/havana

Stable/havana