Develop

Merge develop with master, as basic functionality is ready