Fix Clang 3.5 compilation
Fix Clang 3.5 compilation
Merge branch 'master' of github.com:Corralx/leviathan