fixes #33
Merge branch 'master' of https://github.com/ddf-project/DDF