Merge pull request #30 from chrqls/dev

[#23] Retake scenario is working now