Merge pull request #212 from mverzett/master

Various bug fixes, 2D efficiency fitting tool
bugfix and clean-up
added function, bugifix