Update Dev

Dev
Merge pull request #1 from riemi-nie/dev

Dev