Merge pull request #4 from chaosAD/master

Still add some silly function headers for demo
Revert back to original state
Fix the merge conflict in Operator.h