second try
Merge branch 'master' of https://github.com/alaris83/beaster-dev