Merge pull request #6 from josator/develop

Fixed libraries includes in Sconstruct files
Merge branch 'develop' into out-of-core