Merged dev

Added comments