20140107_los_angeles: stevefolta
Manually merge pull request #3 from stevefolta/master