fixed issue #13: switching between branches