paper format

previously there are conflict in merging, now i have merged master branch of the upstream repo.