Merge pull request #4 from PabstMirror/master

2014/10/24
Merge pull request #1 from zerithsmash/master

Update from original