merging to master
deleting some unnecessary file
makefile change
ongoing, not a final version
after merging with youngmoon branch