Add FIXME messages for merge #141
Merge pull request #143 from jorgesilva/develop

Add FIXME messages for merge #141