Merge pull request #394 from f1rebird/master