Merge pull request #1 from blackdev1l/master

Merge @ Aulavara
new commits - 2.07pm - 07.12.14
new commits - 2.33 - 07.12.04
new commits - 4.00pm - 07.12.14
Merge pull request #11 from Lazarus118/master

@ Aulavara