branch update
Merge pull request #2 from Sinkrad/branch

branch update