Merge of merge-requests/20 from wolftune