Merge pull request #22 from midraal/development

bring development back in line with master