Stage -> dev
Merge pull request #21 from tlvince/refactor/stage-to-dev

Stage -> dev