Merge pull request #36 from fsb4000/guide