Updates per Issue #7

Parity sync with dcordova