Merge pull request #4 from diekmann/dev-unstable

Dev unstable
Merge branch 'dev-unstable'