Merge pull request #55 from wick-ed/master

reviewed diff and tested locally with 0.6.0
removed function inclusion and updated config