Merge pull request #1 from techdivision/master

yy
Merge pull request #13 from larsroettig/master

Merge pull request #1 from techdivision/master