commit
Merge branch 'masse2' of github.com:samkos/oyak into masse2