update procfile
Merge branch 'release/0.1.2'
fix conlict