Pulled down update to makespec
makespec with file inclusion
makespec with file inclusion