Merge pull request #12 from amsonko/amsonkobranch

wid5
merge