Updating issue_17 with master