Update from FreeApophis:master