Merge pull request #21 from MechStar/master

Added support per Issue 19 & 20