Updated stable branch
Added undefined axis exception
Merged in updates from stable