Merge pull request #1 from BlissRoms/master

Bring up to date with BlissRoms/master