Merge fix from #22 thx @TomSellers