sumtin
Merge branch 'master' of github.com:svanschooten/Grijper
Got everything working!