Fix 20140701

Cancellation token added to asyncronous methods and minor improvements.