Merge upstream master & PR #2 (Add plot target)