US-1 completed
Merge pull request #1 from mirog/US-1

US-1 completed