Minor Changes
Merged Master to Leif