Fixed problems resulting from improper merge in upstream
Merge pull request #6 from rhmtts/master

Fixed problems resulting from improper merge in upstream