minor fixes..
Merge branch 'master' into topic/breeding_api