First addition from desktop
Merge pull request #1 from meiwey/develop

First addition from desktop