merge dev to master, updated comments, fixed spelling error