Merge pull request #5 from oberstet/master

Fix for masker, add factory for masker