Compatching
Merge pull request #19 from Meneth/master

Compatching