Merge pull request #156 from burzum/develop

Adding the changelog