Initial import
Merge branch 'release/0.5.3'