Version 0.2

Updated and improved library / file inclusion