yuki-kimoto Merge pull request #197 from bilogic/better-setup