Flying fix
changelog update
Merge pull request #108 from noxsicarius/master

Update test branch