Updated AS to 0.3.6
Merge remote-tracking branch 'origin/master'