merging new files to IanJRigg:master branch