Merge branch 'development-2'
Merge pull request #7 from uaktags/master

Merge branch 'development-2'