Updated from master - v0.3.1