Added more convenience functions
Merge branch 'master' of https://github.com/flxb/octopy