Fixed your bugs/limitations

Hi!

I was very glad to find your project, so I didn't have to start from scratch, you already did most of the work!

I fixed the limitations/bugs you mentioned.

Cheers
 Klaus