Lot of changes
Merge pull request #3 from tomvantilburg/master

Lot of changes