Merge pull request #1 from BlissRoms/master

Merge from upstream