merge
Merge branch 'master' of github.com:torhve/Amatyr
xformatterfix