Merge pull request #38 from rhayes-cida/master

Working code
Merge remote-tracking branch 'upstream/master'