Merge branch 'Development'

First public release