Issue 370

I added the missing versions, changed the rules a little bit and added some tests. This should solve Issue #370.