Dev guide

Test pull request - merge Dev guide branch back into master