Initial commit
conflicts with zendmaster resolved