Addresses #63 (warning only)
Merge branch 'v2.0'