Merge pull request #21 from schumy21/master

Schumy
Merge pull request #127 from mackk/master

mod