Updated with a few simple changes.
Pulling in changes.

Merge branch 'master' of https://github.com/lcaballero/snb-1