Update for 2014-12-02
Merge pull request #340 from lawinslow/master

Update for 2014-12-02