ashb Merge pull request #2 from jonasbn/master