review and merge Issues/1