Merge pull request #3 from Twire-Solutions/develop

Develop
Merge pull request #4 from Twire-Solutions/develop

Develop
Updated copyright and performed some minor code reformats.
Merge pull request #5 from Twire-Solutions/master

Merge updates into develop