commit2

this closes #2
Merge pull request #3 from ading999/newbranch

commit2