puppi additions, merge from detatched HEAD commit into master