Issue33

Fix issue 33