Merge pull request #52 from azakus/master

Buildbot support