Added new pictures
Included build for direct use
Data changes and refactoring