Merge pull request #282 from mykmelez/master

3.0 development