Merge pull request #1 from Kevindeving/master

Preparing for new base and fixing bugs
Merge pull request #1 from Marvellousteam/master

Merge pull request #1 from Kevindeving/master