Updating master from dev for 0.2.15