Revert "revert"

This reverts commit f892ac1d37e302a495c6fbc07e645aec1538fa50.
Revert "Revert "Merge pull request #40 from atwixtor/master""

This reverts commit e4e106788165f2049962f196182472ea29d75963.