Merge pull request #1 from apietila/master

Fathom updates and fixes for home network project. Thanks Anna!
updated to icsi svn r807