Merge pull request #65 from sickert/development2

US-08 Fixed