Fix #5 and improve with dropdown
Merge pull request #28 from filipelinhares/master

[ref: #5] Fix and improve dropdown