Merge branch 'master' of github.com:golismero/golismero-devel