More work
Merge pull request #8 from nodoubt223rd/bMurphyDev

More work