basic commit
Merge https://github.com/cyc115/noter