fixed rest of EDX-396
Merge pull request #90 from skim-ks/gacco2/master

fixed rest of EDX-396