First pull request! (master)

Changes were first made to 'master', then merged into 'SFX-8'. This is the 'master' pull request.