Merge pull request #11 from roselone/master

3-16 from roselone
commit-3-16-record
commit-3-16-record
Merge pull request #22 from bxl1989/master

pull 3-16 record