Updating dem beans!
Merge branch 'master' into tjosan