Add aspicore support (fix #584)
Merge original sources