Added runtime configuration.
Pulled down and merged changes.

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