dae Merge pull request #1 from evandroforks/master