Merge pull request #75 from emirhartato/master

minor edits
fixing merge issues
minor edit

adding :guilabel: on the guide