too many changes for one day probably
Merge pull request #1 from AdamHolwerda/master

too many changes for one day probably