Squashed commit of the following:

commit 1326cee1a3c0e049391627ce6f1aa95176b999d0
Author: IUnknown68 <arne@salsitasoft.com>
Date:   Mon Jun 2 17:37:35 2014 +0200

    includes

commit 63c959a14748dba46e34100ec3a96088b0c94b64
Merge: ec54f26 71c8c89
Author: IUnknown68 <arne@salsitasoft.com>
Date:   Tue May 13 19:03:02 2014 +0200

    Merge pull request #17 from salsita/develop

    targetver from Develop