Jony like magical things
Merge pull request #1350 from aspender/master

Jony like magical things