Index: LICENSE.TXT
===================================================================
--- LICENSE.TXT	(revision 0347c89548bfa290a2a6d55486e8885f15a16a35)
+++ LICENSE.TXT	(revision b01252e4d2bf882c4e3550f0f724855d350201fc)
@@ -11,2 +11,4 @@
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Also see https://github.com/SasView/sasview/blob/master/installers/license.txt
Index: docs/sphinx-docs/source/user/RELEASE.rst
===================================================================
--- docs/sphinx-docs/source/user/RELEASE.rst	(revision a98c55a697452e5b75eb567709aaf2f1cdaed64b)
+++ docs/sphinx-docs/source/user/RELEASE.rst	(revision 9849f8a8d6479a7f8f4037eb8e9192e79fa86cf6)
@@ -18,12 +18,14 @@
 
 With this version the change to the new model API and plugins infrastructure
-begun with 4.0 is essentially complete (though extensions are in the works
-and more are likely they should remain backwardly compatible with previous
+begun with 4.0 is essentially complete (though extensions are in the works,
+and more are likely, they should remain backwardly compatible with previous
 versions of SasView).
 
-.. warning:: Old-style plugin models, including old sum|multiply models will continue
-             to be supported (i.e. SasView will be able to run them) in 4.x. However,
-             the expectation is that such support will be removed in 5.0 and everyone
-             is strongly encouraged to convert their custom models to the new API.
+.. warning:: Old-style plugin models, including old sum|multiply models, continue
+             to be supported (i.e. SasView will run them) in 4.x, although our
+             automatic on-the-fly translation may not cope in all use cases (see 
+             Known Issues below). However, this backward compatibility will be 
+             removed in 5.0 and users are therefore strongly encouraged to 
+             convert their custom models to the new API.
 
 Finally, the changes to orientation angles and orientational distribution
@@ -56,4 +58,6 @@
   objects have been rectified. Some questions remain however.
 * The known issue with the core_shell_parallelepiped model is now fixed.
+* An error in the be_polyelectrolyte model was identified and rectified, but 
+  the fix is yet to be validated.
 * A number of issues and inconsistencies with the creation of
   sum|multiply models have been rectified.
@@ -64,4 +68,6 @@
 * There are several data loading improvements.
 * There are several improvements to Save/Load Project.
+* The SasView version number now appears in Reports.
+* The Release Notes are now available from the program Help menu.
 * There have been numerous other bug fixes.
 
@@ -70,7 +76,15 @@
 Several sections of the help documentation have undergone significant
 checking and updating, particularly those relating to orientation,
-magnetic scattering, and polydispersity distributions. Detailed
-advanced instructions for plugin writing and some scripting
-instructions have been added.
+magnetic scattering, and polydispersity distributions.
+
+Detailed advanced instructions for plugin writing and some scripting
+instructions have also been added.
+
+Concerns about the intended versus implemented meaning of some parameters
+in the bcc_paracrystal, fcc_paracrystal, and sc_paracrystal models have
+been brought to our attention. These have yet to be resolved and so a
+Warning has been placed on each of these models. Anyone who feels they
+may have the requisite expertise to investigate these concerns is strongly
+encouraged to contact the Developers!
 
 Other Work
@@ -90,4 +104,5 @@
 Bug Fixes
 ^^^^^^^^^
+* Fixes #  14: Loading a saved project is really really slow
 * Fixes # 260: Box integration does not update when entering values in dialog
 * Fixes # 446: Saving plot as PGF (not PDF!) format throws error
@@ -109,8 +124,9 @@
 * Fixes # 784: Add 3D integral to Correlation Function analysis
 * Fixes # 786: core_shell_parallelepiped 1-D model is incorrect
-* Fixes # 818: "report button" followed by "save" makes an empty pdf file
+* Fixes # 818: report button followed by save makes an empty pdf file???
+* Fixes # 830: Check compliance of loader against NXcanSAS-1.0 release
 * Fixes # 838: Fix model download from marketplace
 * Fixes # 848: can't save analysis when only one fit page
-* Fixes # 849: Load Folder should ignore files starting with "."
+* Fixes # 849: Load Folder should ignore files starting with .
 * Fixes # 852: More unit tests, especially for oriented or 2d models
 * Fixes # 854: remove unnecessary sleep() in fitting perspective
@@ -134,4 +150,5 @@
 * Fixes # 906: polydispersity not showing up in tabulated results
 * Fixes # 912: About box points to misleading contributors page on Github
+* Fixes # 913: Need to add Diamond developer and logo in relevant places
 * Fixes # 915: load project issues
 * Fixes # 916: Proper Logging
@@ -151,4 +168,5 @@
 * Fixes # 961: sasmodels tests should fail if the parameter name does not exist
 * Fixes # 962: star polymer typo in docs
+* Fixes # 966: Inconsistent chi2 reporting
 * Fixes # 967: no uncertainties errors on fitting parameters
 * Fixes # 969: About Box not picking up dls_logo.png
@@ -166,7 +184,8 @@
 * Fixes #1006: multiplicity models don't work with SQ
 * Fixes #1007: spherical_sld model freezes SasView
-* Fixes #1008: plugin model scaling not working? S
+* Fixes #1008: plugin model scaling not working?
 * Fixes #1010: Win64 build script not creating working executable
 * Fixes #1011: sld_test failing on ubuntu
+* Fixes #1012: ESS GUI not updating after fitting
 * Fixes #1013: FileReaderBaseClass output[] not reset - same file loaded multiple times
 * Fixes #1018: add Boltzmann distribution
@@ -174,16 +193,22 @@
 * Fixes #1024: Update version numbers in master
 * Fixes #1025: Sum/multiply editor hangs
+* Fixes #1030: volume normalization for hollow shapes is different from solvent-filled shapes
 * Fixes #1032: convert C++ modules to C
 * Fixes #1035: Order of combining P(Q) and S(Q) in Plugins seems to matter
 * Fixes #1037: data loader crop not working? & all fits crashing
 * Fixes #1043: problem compiling marketplace models
+* Fixes #1044: Unable to upload c file to marketplace
+* Fixes #1046: convert non builtin models in the marketplace to new API
 * Fixes #1050: fix appveyor test for sasmodels win 64 python 3
 * Fixes #1052: Can't use a user-created plugin model in a plugin model
+* Fixes #1054: Check plugin & orientation descriptions in full docs once SasModels PR #57 is merged
 * Fixes #1057: phi rotation issue for elliptical cylinder
 * Fixes #1060: incorrect default for rectangle dispersion
 * Fixes #1062: win32 build not installing correctly
-* Fixes #1064: Fitting did not converge!!! error with a Sum|Multi plugin model
+* Fixes #1064: "Fitting did not converge!!!" error with a Sum|Multi plugin model
+* Fixes #1068: 2d data (from NG7) not loadiing - strange format?
 * Fixes #1069: GUI problem when using polydispersity/orientation distributions
 * Fixes #1070: Parameter error boxes should not be editable
+* Fixes #1072: Orientation distributions seem to depend on initial angle
 * Fixes #1079: Remove save button in report dialog on Mac
 * Fixes #1081: GUI problem with new orientation distribution
@@ -191,4 +216,5 @@
 * Fixes #1099: Erratic behaviour of Sum|Multi model in 4.1.2
 * Fixes #1101: Batch results page not displaying polydispersity values
+* Fixes #1128: AutoPlot generation for model documentation does not include background
 * Fixes #1131: OpencCl dialog does not open
 * Fixes #1132: Slit Size Calculator Tool not working
@@ -196,11 +222,18 @@
 * Fixes #1141: Intro to scripting.rst needs improvement
 * Fixes #1142: Plugin framework is broken
-* Fixes #1044: Unable to upload c file to marketplace
 * Fixes #1145: Update models in model marketplace to 4.2 when 4.2 is released.
-* Fixes #1148: Documentation for S(Q) models need updating
-* Fixes #1128: AutoPlot generation for model documentation does not include background
-
-It is recommended that all users upgrade to this version, but your
-attention is drawn to the Changes section above.
+* Fixes #1155: BE Polyelectrolyte errors
+* Fixes #1160: fix VR for core_shell_cylinder, fractal_core_shell and hollow_cylinder
+* Fixes #1163: Fix help note in sum of sum|multiply interface
+* Fixes #1164: Sphinx doc build does not support superscript or substitution
+* Fixes #1166: No longer able to report from multiple fit pages
+* Fixes #1167: Clarify the documentation for the Spinodal Model
+* Fixes #1173: more problems with math in plugins
+* Fixes #1176: Make Release Notes/Known Issues available from Help in Menu Bar
+* Fixes #1179: PDF Report should contain SasView Version Number
+* Fixes #1183: Test from creating new model reset all parameters to default in all open FitPages
+
+**It is recommended that all users upgrade to this version, but your 
+attention is drawn to the Changes section above.**
 
 
@@ -759,13 +792,41 @@
 Known Issues
 ============
+
+A full list of known bugs and feature requests by release version that 
+users may wish to be aware of can be viewed at http://trac.sasview.org/report/3
+
 4.2.0 - All systems
 -------------------
-There are currently no major known issues. A full list of known bugs and
-feature requests by release version that users may wish to be aware of
-can be viewed at http://trac.sasview.org/report/3
-
-.. note:: Any corrections to models that may become known/available will be
-          posted to Marketplace as available (and fixed in the following 
-          release)
+The refactoring of the plugin model architecture means that some issues 
+may be encountered if Save Project/Analysis files using plugin models 
+created in earlier versions of SasView are loaded in version 4.2.0.
+
+For example:
+
+* on loading an old project file an error window appears with the error 
+  *This model state has missing or outdated information* or *dictionary changed size during iteration*.
+
+   * if this occurs, try restarting SasView and reloading the project.
+   
+* on loading an old project file all the FitPages and Graphs appear, but 
+  only the SasView default model parameters appear in the FitPages.
+
+  * this has happened because plugin model parameter names have changed. 
+    There are two possible workarounds:
+    
+   * Install the version of SasView that the project was created in, 
+     recreate the plugin in that version, then run 4.2.0 and re-load 
+     the project. All being well, 4.2.0 will still compile the old 
+     plugin.
+
+   * If 4.2.0 cannot compile the old plugin, the more tedious solution 
+     is to use a text editor to do global search & replace operations 
+     to change all the parameter names in the project file by hand. The 
+     quickest way to see the *existing* parameter names is simply to 
+     scroll to the bottom of the project file. To see what the *new* 
+     parameter names should be, simply create the equivalent plugin in 
+     SasView 4.2.0. In most instances, what was *p1_parameter* will 
+     become *A_parameter*, *p2_parameter* will become *B_parameter*, 
+     and so on. 
 
 4.1.x- All systems
Index: docs/sphinx-docs/source/user/tutorial.rst
===================================================================
--- docs/sphinx-docs/source/user/tutorial.rst	(revision 893d852f3c5e35f1efabd15a592a84ceaeec035d)
+++ docs/sphinx-docs/source/user/tutorial.rst	(revision be460ce662c7d8c4cdb42340ce7027c5bdcf5845)
@@ -21,2 +21,4 @@
 
 :download:`Simultaneous 1D Fitting in Sasview <sasview/simultaneous_1d_fitting_in_sasview_v3x_4x.pdf>`
+
+:download:`Correlation Function Analysis in SasView <sasview/correlation_function_analysis_in_sasview_v4x.pdf>`
Index: installers/license.txt
===================================================================
--- installers/license.txt	(revision d3114cc7e4ecdb328ff50a2af61f638107326813)
+++ installers/license.txt	(revision 73c51df70c01e726ab1221981ae9cd24ab030bb3)
@@ -19,5 +19,5 @@
 SasView is free to download and use, including for commercial purposes.
 
-© 2009-2018 UMD, UTK, NIST, ORNL, ISIS, ESS, ANSTO, ILL, TUD, DLS 
+© 2009-2018 UMD, UTK, NIST, ORNL, ISIS, ESS, ANSTO, ILL, TUD, DLS, BAM  
 
 
Index: src/sas/sascalc/corfunc/LICENSE.TXT
===================================================================
--- src/sas/sascalc/corfunc/LICENSE.TXT	(revision 357a65ad31a89beb165d65e718035be1a1412fa9)
+++ src/sas/sascalc/corfunc/LICENSE.TXT	(revision 357a65ad31a89beb165d65e718035be1a1412fa9)
@@ -0,0 +1,23 @@
+From https://github.com/rprospero/corfunc-py
+
+The MIT License (MIT)
+
+Copyright (c) 2016 rprospero
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
Index: src/sas/sascalc/fit/pagestate.py
===================================================================
--- src/sas/sascalc/fit/pagestate.py	(revision 59873e112188eeb053c5c84f0936a10f563da235)
+++ src/sas/sascalc/fit/pagestate.py	(revision 863ac2c13917d1e25dc3fe0061ef11ef07b02366)
@@ -640,5 +640,6 @@
                 if len(value.strip()) == 0:
                     continue
-                title = value + " [" + repo_time + "]"
+                title = (value + " [" + repo_time + "] [SasView v" +
+                         SASVIEW_VERSION + "]")
                 title_name = HEADER % title
             elif name == "data":
Index: src/sas/sasgui/guiframe/aboutbox.py
===================================================================
--- src/sas/sasgui/guiframe/aboutbox.py	(revision b963b2066d6a76fe5073000c5a596a6fd0130ac4)
+++ src/sas/sasgui/guiframe/aboutbox.py	(revision 1b4cb415644d6a02d2bc0e559654a42560242058)
@@ -108,4 +108,5 @@
         self.bitmap_button_tudelft = wx.BitmapButton(self, -1, wx.NullBitmap)
         self.bitmap_button_dls = wx.BitmapButton(self, -1, wx.NullBitmap)
+        self.bitmap_button_bam = wx.BitmapButton(self, -1, wx.NullBitmap)
 
         self.static_line_3 = wx.StaticLine(self, -1)
@@ -128,4 +129,5 @@
         self.Bind(wx.EVT_BUTTON, self.onTudelftLogo, self.bitmap_button_tudelft)
         self.Bind(wx.EVT_BUTTON, self.onDlsLogo, self.bitmap_button_dls)
+        self.Bind(wx.EVT_BUTTON, self.onBamLogo, self.bitmap_button_bam)
         # end wxGlade
         # fill in acknowledgements
@@ -226,4 +228,10 @@
         logo = wx.Bitmap(image)
         self.bitmap_button_dls.SetBitmapLabel(logo)
+
+        image = file_dir + "/images/bam_logo.png"
+        if os.path.isfile(config._bam_logo):
+            image = config._bam_logo
+        logo = wx.Bitmap(image)
+        self.bitmap_button_bam.SetBitmapLabel(logo)
 
         # resize dialog window to fit version number nicely
@@ -258,4 +266,5 @@
         self.bitmap_button_tudelft.SetSize(self.bitmap_button_tudelft.GetBestSize())
         self.bitmap_button_dls.SetSize(self.bitmap_button_dls.GetBestSize())
+        self.bitmap_button_bam.SetSize(self.bitmap_button_bam.GetBestSize())
         # end wxGlade
 
@@ -325,4 +334,6 @@
         sizer_logos.Add(self.bitmap_button_dls, 0,
                         wx.LEFT|wx.ADJUST_MINSIZE, 2)
+        sizer_logos.Add(self.bitmap_button_bam, 0,
+                        wx.LEFT|wx.ADJUST_MINSIZE, 2)
 
         sizer_logos.Add((10, 50), 0, wx.ADJUST_MINSIZE, 0)
@@ -430,4 +441,11 @@
         event.Skip()
 
+    def onBamLogo(self, event):
+        """
+        """
+        # wxGlade: DialogAbout.<event_handler>
+        launchBrowser(config._bam_url)
+        event.Skip()
+
 # end of class DialogAbout
 
Index: src/sas/sasgui/guiframe/config.py
===================================================================
--- src/sas/sasgui/guiframe/config.py	(revision 8ac05a59a0078f40fc8af4febae16624b9d5c818)
+++ src/sas/sasgui/guiframe/config.py	(revision 1b4cb415644d6a02d2bc0e559654a42560242058)
@@ -51,5 +51,5 @@
 '''M. Doucet et al. SasView Version 4.1.2, Zenodo, 10.5281/zenodo.825675'''
 _acknowledgement =  \
-'''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547,\n but is currently maintained by a collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, DLS, and the scattering community.\n\n SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project (Grant No 654000).\nA list of individual contributors can be found at: http://www.sasview.org/contact.html
+'''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547,\n but is currently maintained by a collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, DLS, BAM and the scattering community.\n\n SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project (Grant No 654000).\nA list of individual contributors can be found at: http://www.sasview.org/contact.html
 '''
 
@@ -90,9 +90,10 @@
 _tudelft_url = "http://www.tnw.tudelft.nl/en/cooperation/facilities/reactor-instituut-delft/"
 _dls_url = "http://www.diamond.ac.uk/"
+_bam_url = "http://www.bam.de/"
 _danse_url = "http://www.cacr.caltech.edu/projects/danse/release/index.html"
 _inst_url = "http://www.utk.edu"
 _corner_image = os.path.join(icon_path, "angles_flat.png")
 _welcome_image = os.path.join(icon_path, "SVwelcome.png")
-_copyright = "(c) 2009 - 2018, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, and DLS"
+_copyright = "(c) 2009 - 2018, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, DLS and BAM"
 marketplace_url = "http://marketplace.sasview.org/"
 
Index: src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py
===================================================================
--- src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py	(revision 2924532bedb06633b9888eb37ac4bd1a31dbbeff)
+++ src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py	(revision 9c7e2b8361553f8e2f246d344c791c385f3b2254)
@@ -182,5 +182,4 @@
                 file_errors[basename] = [log_msg]
                 continue
-
             try:
                 message = "Loading {}...\n".format(p_file)
@@ -204,12 +203,8 @@
                 self.load_update(message="Loaded {}\n".format(p_file),
                                  info="info")
-
             except NoKnownLoaderException as e:
                 exception_occurred = True
-                error_message = "Loading data failed!\n" + e.message
-                self.load_complete(output=None,
-                                   message=error_message,
-                                   info="warning")
-
+                error_message = "Loading data failed!" + e.message
+                file_errors[basename] = [error_message]
             except Exception as e:
                 exception_occurred = True
@@ -220,7 +215,5 @@
                 file_err += " following:\n"
                 file_err += e.message
-                self.load_complete(output=None,
-                                   message=file_err,
-                                   info="error")
+                file_errors[basename] = [file_err]
 
         if len(file_errors) > 0:
@@ -231,5 +224,4 @@
                 for message in error_array:
                     error_message += message + "\n"
-                error_message = error_message[:-1]
             self.load_complete(output=output,
                                message=error_message,
Index: src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst
===================================================================
--- src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst	(revision 501712f1244207d4374798e9fc89547f1f6af96d)
+++ src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst	(revision 490f79075e15c069f2a131d3ccd6a1e510e7dcfe)
@@ -33,6 +33,6 @@
 Both analyses are performed in 3 stages:
 
-*  Extrapolation of the scattering curve to :math:`Q = 0` and toward 
-   :math:`Q = \infty`
+*  Extrapolation of the scattering curve to :math:`q = 0` and toward 
+   :math:`q = \infty`
 *  Smoothed merging of the two extrapolations into the original data
 *  Fourier / Hilbert Transform of the smoothed data to give the correlation
@@ -47,5 +47,5 @@
 -------------
 
-To :math:`Q = 0`
+To :math:`q = 0`
 ................
 
@@ -67,5 +67,5 @@
 the impact on any extrapolated parameters will be least significant.
 
-To :math:`Q = \infty`
+To :math:`q = \infty`
 .....................
 
@@ -145,7 +145,7 @@
 	- do they smoothly curve onto the ordinate at x = 0? (if not check the value 
 	  of :math:`\sigma` is sensible)
-	- are there ripples at x values corresponding to (2 :math:`pi` over) the two 
+	- are there ripples at x values corresponding to (2 :math:`\pi` over) the two 
 	  q values at which the extrapolated and experimental data are merged?
-	- are there any artefacts at x values corresponding to 2 :math:`pi` / q\ :sub:`max` in 
+	- are there any artefacts at x values corresponding to 2 :math:`\pi` / q\ :sub:`max` in 
 	  the experimental data? 
 	- and lastly, do the significant features/peaks in the correlation functions 
@@ -158,5 +158,6 @@
     -q^{4} I(q)
 
-The IDF is proportional to the second derivative of Î\ :sub:`1`\ (x).
+The IDF is proportional to the second derivative of Î\ :sub:`1`\ (x) and represents a 
+superposition of thickness distributions from all the contributing lamellae. 
 
 Hilbert
@@ -192,4 +193,8 @@
 *   Local Crystallinity :math:`= L_c/L_p`
 
+.. warning:: If the sample does not possess lamellar morphology then "Compute 
+    Parameters" will return garbage!
+	
+
 Volume Fraction Profile
 .......................
@@ -213,4 +218,5 @@
 
 The reader is directed to the references for information on these parameters.
+
 
 References
@@ -263,5 +269,8 @@
 Once the Q ranges have been set, click the "Calculate Bg" button to determine the 
 background level. Alternatively, enter your own value into the box. If the box turns 
-yellow this indicates that background subtraction has created some negative intensities.
+yellow this indicates that background subtraction has created some negative intensities. 
+This may still be fine provided the peak intensity is very much greater than the 
+background level. The important point is that the extrapolated dataset must approach 
+zero at high-q.
 
 Now click the "Extrapolate" button to extrapolate the data. The graph window will update 
@@ -296,3 +305,3 @@
 
 .. note::
-    This help document was last changed by Steve King, 26Sep2017
+    This help document was last changed by Steve King, 28Sep2017
Index: src/sas/sasgui/perspectives/invariant/invariant_state.py
===================================================================
--- src/sas/sasgui/perspectives/invariant/invariant_state.py	(revision fa412df39d3c5338c2c5f69fed935b428f385ebe)
+++ src/sas/sasgui/perspectives/invariant/invariant_state.py	(revision e9920cd1fef162ad399cc9f42a588bb14006c327)
@@ -130,8 +130,10 @@
         my_time, date = self.timestamp
         file_name = self.file
+        from sas.sasview.__init__ import __version__ as sasview_version
 
         state_num = int(self.saved_state['state_num'])
         state = "\n[Invariant computation for %s: " % file_name
-        state += "performed at %s on %s] \n" % (my_time, date)
+        state += "performed at %s on %s] " % (my_time, date)
+        state += "[SasView v%s]\n" % (sasview_version)
         state += "State No.: %d \n" % state_num
         state += "\n=== Inputs ===\n"
Index: src/sas/sasview/local_config.py
===================================================================
--- src/sas/sasview/local_config.py	(revision 8ac05a59a0078f40fc8af4febae16624b9d5c818)
+++ src/sas/sasview/local_config.py	(revision 1b4cb415644d6a02d2bc0e559654a42560242058)
@@ -51,5 +51,5 @@
 '''M. Doucet et al. SasView Version 4.2, Zenodo, 10.5281/zenodo.1412041'''
 _acknowledgement =  \
-'''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547,\n but is currently maintained by a collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, DLS, and the scattering community.\n\n SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project (Grant No 654000).\nA list of individual contributors can be found at: http://www.sasview.org/contact.html
+'''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547,\n but is currently maintained by a collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, DLS, BAM and the scattering community.\n\n SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project (Grant No 654000).\nA list of individual contributors can be found at: http://www.sasview.org/contact.html
 '''
 
@@ -76,4 +76,5 @@
 _tudelft_logo = os.path.join(icon_path, "tudelft_logo.png")
 _dls_logo = os.path.join(icon_path, "dls_logo.png")
+_bam_logo = os.path.join(icon_path, "bam_logo.png")
 _nsf_logo = os.path.join(icon_path, "nsf_logo.png")
 _danse_logo = os.path.join(icon_path, "danse_logo.png")
@@ -94,5 +95,5 @@
 _corner_image = os.path.join(icon_path, "angles_flat.png")
 _welcome_image = os.path.join(icon_path, "SVwelcome.png")
-_copyright = "(c) 2009 - 2018, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, and DLS"
+_copyright = "(c) 2009 - 2018, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, DLS and BAM"
 marketplace_url = "http://marketplace.sasview.org/"
 
