Merge pull request #18 from jhaynie/master

Changes to make ACS better for node apps