Merge pull request #128 from okyriosy/master

Added ash unification
Merge pull request #1 from BBoldt/master

Merge pull request #128 from okyriosy/master