Alot of fixes
Merge pull request #3 from MrTheSoulz/Test

0.2.4