Fixed:
0001377
0001345
Merge branch 'master' of https://github.com/lpaprock/idc-github