Initial
Some necessary updates
Merge branch 'release/0.2'
Merge remote-tracking branch 'test/master'