Revision 5

- Added new files
- Added new functions
- Fixed some functions