MacTavish issues

Results 2 issues of


                                            MacTavish

![image](https://user-images.githubusercontent.com/7744078/28248742-4640be68-6a7c-11e7-8972-41b9a4b839c8.png)