add constants
settle conflict
Merge pull request #2 from MrSATA/jasper0918-master

Jasper0918 master