Sample2 update
Merge branch 'master' of https://github.com/spholman/misc