Merge with develop branch
The next version will be 0.6.0