* got rid of compilation warnings
Merge branch 'master' into explorer