Added support per Issue 19 & 20