Several SNOM revisions
Fix up the snom fixes
Merge pull request #27 from tm1000/snom-revs

Several SNOM revisions