Joren branch added to master

Please check out my code so it can be merged.