bronhuston pull request from Vincente Lara finished issue #18 also cleaned up comments

~150
150 for fixing issue #18
thank you