Develop

closes fabianvf/scrapi#25