Merged dev version with master