added in some details to make this app work like a charm - needs testing though
Merge remote-tracking branch 'origin/master'
resolved merge