Merge pull request #646 from sergiud/release-0.5

release 0.5