Merge pull request #6 from varkoly/master

add missed conflict
Include included routines.