Minor
Merge branch 'master' of http://github.com/wontonst/hacksc-2014
merge