updates from today
Merge pull request #14 from marschall/2013-01-30

updates from today