Develop

Move important SDK changes related to setup best practices and fixing issues #7 into master.