Quick and dirty implementation for #104. Closed and created issue #113
to clean things up.