Issue35

Fix issue #35