fixes #102
Merge pull request #4 from splintermind/DF2014

fixes #102