Added before branch to Issue#8