Loads of changes, too much to describe. :)
Merge pull request #55 from jorisvervuurt/master

Loads of changes, too much to describe. :)