Merged master with my branch
#525 documentation fix