Merge pull request #1 from doloihp89/newbranch

pull code from newbranch to master
add new
Merge pull request #2 from doloihp89/master

merger code from master to newbranch