Merge pull request #40 from branflake2267/brandon_cucumber

Brandon cucumber
Merge remote-tracking branch 'origin/master' into brandon_cucumber