Merge pull request #5 from eberletj/master

Getting test branch up to date