Merge pull request #3 from enuilin/master

Merge things
Merge pull request #4 from Tzigarroth/master

Merge pull request #3 from enuilin/master