Merge pull request #128 from okyriosy/master

Added ash unification