0.2.1 (merge from shifting branch)