merged master to dist