Merge pull request #9 from nubs/master

Split out configuration.