Merge branch 'cuttingedge' of git@github.com:DmitryBaranovskiy/raphael into cuttingedge