Address #92

/cc @mikesherov 
Done