Some bugs fixed

A stupid question, but how can I synchronize my github fork with your master?

Best regards
Andreas