some R&D work
Merge branch 'master' of github.com:NullVoxPopuli/Rum