0.1.0 development branch

```
Merge-From: 0.1.0-devel
Merge-To: master
Commits: 5
Added-Functions: 3
Bugs-Fixed: 2
Added-Lines: 167
Removed-Lines: 11
Latest-Version: 0.1.5
Snapshots: 1
Devel-Builds: 5
```