Still add some silly function headers for demo
Resolve the conflict. Found out that it is a minor problem.
Merge pull request #4 from chaosAD/master

Still add some silly function headers for demo