Issue 106

@andreasohlund can you review this to make sure this is what you are after?