final updates
Merge pull request #41 from velinalee/newbranch

final updates