Merge pull request #4 from gtdavidv/master

Update branch
tmp file with code to set combo for first time
Merge pull request #5 from gtdavidv/david

David