update to version 0.5.0
Merge remote-tracking branch 'upstream/master'
Adding some changes and tests