Small bugfixes to suppress warnings/errors, especially with todos.
Version bumped from 0.5.2 to 0.5.3
Merge branch 'release-0.5.3'