Pass specs
Merge pull request #20 from HenrykChiu/fix_bug

Pass specs