100914
changes made by Joel
Merge pull request #5 from ylee178/joelg

Joelg