Merge pull request #652 from BrianBland/configuration

NG: Configuration parser