fixing symptoms
Merge pull request #30 from kmabey/LocalDev

Local dev
Symptoms fixed
Merge pull request #31 from kmabey/LocalDev

Dev
Merge pull request #32 from kmabey/dev

Dev
Merge pull request #33 from kmabey/qa

Qa