Merge pull request #1 from houbena/master

update development