Flo's Pull Request

@florrain @12and1studio @mrocco64 - I'm creating this pull request so we can collaborate/review the code.