Merged old project from bit bucket