stuff amended
Merge branch 'master' of https://github.com/zogwart/test