setup surprising

Signed-off-by: Dustin Christensen <dustyman@gmail.com>
Merge branch 'refs/heads/master' into Dustin
Merge pull request #2 from htakahashi/Dustin

Dustin