smspezzano/d2jive — pull request #24 by dvmonroe (2014-03-28 02:00:06+00:00)
Title: Upstream master

fixed merged conflicts from Spencer's push.