Implement new features based on StackOverflow/CodeReview sugesstions
Merge tag 'v1.1.0'