Development

Merge new init changes to master...