5,madigan6: merging from madigan6 to master
5,madigan6: merging from madigan6 to master continued