Merge pull request #3 from epall/branch_c

branch c #1
Merge branch 'master' into branch_d