some friction
Merge remote-tracking branch 'upstream/master'
Worked further on theory...
Worked even further on theory.
Merge pull request #3 from tobbelobb/master

Further theory