Merge branches 'dev' and 'master' of github.com:hiryou/pandora_extractor into dev