fixed bugs on EDX-396
Merge pull request #87 from skim-ks/gacco2/master

fixed bugs on EDX-396