Merge pull request #58 from rdc-seattle/bugfix

Merge with color(in progress)/transition changes