asgasd

this closes #6
Merge pull request #7 from ading999/newbranch

asgasd