Address #92

/cc @mikesherov 
Right now, it has pretty limited use, would be use-case otherwise?