Test updates part 2

Test updates part 2
Merge pull request #107 from mfunk/master

Test updates part 2