Update to 6.3.0
Merge pull request #1 from mattyohe/master

Update to 6.3.0