Merge branch 'patch-1' of git://github.com/leemark/public-apis into leemark-patch-1