Mandrakes Update
two problem fixed.
Merge pull request #131 from yogpstop/bugFix

two problem fixed.
Mandrake Update
Merge pull request #1 from perky/master

Just some mo' updates for mah InfiCraft 2-athon tomorrow