Gunnar fixes on Song et. al.
Merge branch 'master' of github.com:terjr/thesis