bronhuston pull request from Vincente Lara finished issue #11, started issue #12, started issue #16

~requested: 250 
40 for fixing issue 11
for issues #12 and #16 i can only ask for partial points with you being the judge of how many i can receive
Thank you