to be merged
Merge with Joerie Master branch
Merge with branch Joeri master
merge with branch joeri master
merge yet again
Added spinner