Fix issue #30
v20130929