merged petosky branch to master