#32 ported but not yet working
#30 initial port - not yet working
Merge branch 'master' into polymer_animation
fixes #32