some edits
Merge branch 'master' of https://github.com/changhoonhahn/qfpaper
Got lazy with the commits