Merge pull request #18 from sodanca/master

branch update