First pull request! (Redone, as per ScalaFX source code branching policy)

Changes were first made to 'master', then merged into 'SFX-8'.