Merge pull request #5 from eberletj/master

Getting test branch up to date
Merge pull request #6 from eberletj/Test

Merge pull request #5 from eberletj/master