Fixed issue #24 #