added default
Merge branch 'master' of https://github.com/feitelsonc/CS154PA1