Fix broken execution flow.
Merge pull request #20 from keitaoouchi/fix_execution_flow

Fix broken execution flow.