closes #80. Signed-off-by: Sean Busbey <busbey@apache.org> (cherry picked from commit 8f8d57177952a7dc8f3a4a6e6ad5d4f3d51744c0)