Merge pull request #25 from vapier/master