Merge branch 'midgetspy/development'