Fix #17
Merge pull request #27 from JuliaStats/kms/or_fix

Fix #17