Merge pull request #26 from rofl0r/master