Merge branch 'pthariensflame-master'. Close #9.