latest edits to merge into master
Merge remote-tracking branch 'origin/master' into fine_tuning
Merge pull request #3 from LaunchPadLab/fine_tuning

Fine tuning