Minor change
Merge pull request #77 from jateeter/master

Minor change
@Ignore in the tests
Merge pull request #78 from jateeter/master

@Ignore in the tests
Merge remote-tracking branch 'upstream/master'