ikosmidis Merge pull request #17 from ikosmidis/develop