Merge pull request !286 from Juno/master
Merge pull request !288 from Juno/master