more scaffold
Merge pull request #3 from Mayho/master

more scaffold