master version bug fix
merging conflict from master fixed
feature 1 complete commit