Fix for Clockwork
Merge pull request #35 from ExtReMLapin/master

Fix for Clockwork