added some code
Merge branch 'dosomecode'