#320 Todo removed
Merge pull request #397 from longtimeago/320

#320 Todo removed