Fixed some issues with configuration.
Merge remote-tracking branch 'jadestorm/master'