Addressed github #18