commit before merging
merging
Merge branch 'master' of https://github.com/yaukwankiu/armor
             toPlotContours=True,

             toPlot3d = False,
resolving conflicts