Merge pull request #3 from ppolinsky/master

dont know why its asking me to do this considering there are 0 additions and 0 deletions but my fork will finally be up to date after this.