Removed todo that was fixed in #312 - fixes #343
Merge remote branch 'fork/302a'