added changes from koenige/swtparser@23946b6dd8887a71ec69d70a701c12f0cdf840ed
added changes from koenige/swtparser@deaf1503ed1aad56a1dc47daeb570c9953016656