Merge network check changes

closes #12