ikosmidis Merge pull request #18 from trackerproject/develop