Fix #697
fixed conflict
Handle part of #551
merged master
Merge pull request #698 from getnikola/empty-conf

Fix #697