Merge pull request #60 from kgriffs/Issue_51

Issue 51
Merge remote-tracking branch 'upstream/master' into Issue-43