Merge pull request #3 from 410-VS/master

Updating
Update after merging
Merge pull request #23 from dixonj30/master

Added output control