Merged pencilcheck's changes with master