Fixed problem with not returning from method call
Merge with master