Created by: martinburchell
Only two commits to review here https://github.com/aptivate/internewshid/commit/daf6173a6f59ada82e8f5162abd7d7f150cec1b3 and https://github.com/aptivate/internewshid/commit/a5d41207b37dceea35f8f55915ea3fefe92ec469