did some rearanging of methods as well as some comments
trying to merge one more time
Merge pull request #103 from nhlien93/master

trying to merge with master