Revision 2

Fixed Various Platform Related Problems