merged master and commentary branch