fixing bug with manifest
fixing bugs with reconfigure
Merge pull request #50 from toumorokoshi/master

Sync master into develop