Merge pull request #9 from markormesher/master

merge
update config
add moar config
config
Merge pull request #19 from musalbas/master

merge