Merge pull request #3 from pioneerspacesim/master

update
Merge pull request #4 from pioneerspacesim/master

update
Merge pull request #5 from pioneerspacesim/master

sync
Merge pull request #8 from pioneerspacesim/master

sync to master
Merge pull request #7 from NyankoSensei/master

sync