Merge pull request #1 from cnb/master

get new commits