Merging Develop into Master

merging the includeStats patch by @oskarhane into master to make a release