Merge pull request #3 from mplaza/christiebranch

Merge pull request #2 from mplaza/master
christie's edits
christie's edits