merge #2 from skyfire