Fixed bugs with cascade options
Fixed bug with cascade upload and some other small fixes
Merge pull request #25 from annavernidub/bug-cascade-options

Fixed bugs with cascade options