Merge branch 'release/0.2.3' into develop
Forgot to take out the debugging errors and add back in '(N/A)'
Updated docs
Merge branch 'release/0.2.4'