Closes #87. (cherry picked from commit 7ef14587e207ad0d8144333add2656aef3abcfd1) Signed-off-by: John Blum <jblum@pivotal.io>