qtrinh Merge pull request #4 from bgruening/master