add changes from dotme repo