Fixed bug in last commit, seems to work now.
Merge branch 'master' into feature-fisher