pathologic to dev
Merge pull request #16 from betz/master

pathologic to dev