Merge pull request #157 from fsb4000/conf