bunnie Merge pull request #28 from cyrozap/master