Issue #10: resolving conflict from merge
Merge pull request #17 from uProxy/kpdyer-fixthebuild

Issue #10: resolving conflict from merge