dojo code
Merge pull request #1 from pfunk-ml/master

day of commits