Merge pull request #25 from fighting-spirit/master