updates
Merge pull request #2 from bnikolaus/newbranch

updates