Added stuff from UnLogic

Added stuff from UnLogic(http://f1repl4ce.enjin.com/forum/m/19328304/viewthread/12013020-1710unlogic)