merge
Merge pull request #1 from patrickdos/master

merge conf and change HEAD backend