Merge pull request #6 from oleg/yml-settings