Bug 976706 - Address Ehsan's review
Fixes for mdas' review
Fixes for ato's review
Address comments from jgraham and ehsan
Merge pull request #69 from dminor/address-ehsan-review

Bug 976706 - Address Ehsan's review