I'm too sick to do anything right now
Merge branch 'donald' of https://github.com/joshcc3/jphack into donald