Merge pull request #58 from rdc-seattle/bugfix

Merge with color(in progress)/transition changes
Merge pull request #59 from rdc-seattle/master

Merge pull request #58 from rdc-seattle/bugfix