continuing to fix
Merge pull request #179 from kmabey/LocalDev

continuing to fix