Subs drop down WIP
Merge pull request #217 from sammuel86/dev-0.3

Subs drop down WIP