- integrated all commits from NFicano main project until up-to-date
Merge pull request #2 from Timtam/master

- integrated all commits from NFicano main project until up-to-date