Merge pull request #20 from Pandos/master

Some enhancements to the previous "home" commit.