Merge pull request #41 from wigumen/dev

Merged dev into dev_exp
Merge pull request #43 from wigumen/dev_exp

Updated Dev_exp