nightsprout/alonmor — pull request #35 by dtpowl (2014-10-25 00:54:02+00:00)
Title: Dtp/merge fixes

unbreak some stuff that broke in the merge