Added a couple of #Fixme and #TODO entries
Merge branch 'release/1.0.0' into develop