Re-worked ENV vars and ADD to handle variables correctly
Merge pull request #2 from lukebond/master

Re-worked ENV vars and ADD to handle variables correctly