definately fixed that terrible issue!
Merge branch 'master' into iss1