Merge pull request #25 from ProPercivalalb/master

Gimme updates!
Quick reformatting
Merge pull request #60 from chylex/master

Quick reformatting