dev version 1.0 commit
merging errors