Fixed issue (#24)