first commit
Merge https://github.com/vanSchaening/test
testing commits