first-commit
Merge https://github.com/legopelle/Project-Golem
second commit