refreshing master

pulling updates from halo