Merge pull request #2 from harriswong/AT-4848