Grimley517 issue3

This might just be waiting for Travis to Catch up on the automated testing.